Merge branch 'dev'

Conflicts:
	.gitignore

diff --cc .gitignore
index 99cf5ff7dc576ef83985e1c8be2d06f8cc190b7d,533eb5ee9baf741653d9201fc6c31d9433e6ce49..400b9768f03459dec8fec38802784325f6811d5e
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,7 +1,6 @@@
  *.*~
 -*.*~
+ *.pyc
+ /db.sqlite3
+ /manage.py
+ /mysite*
+ /plan.txt