20130905
Merge branch 'Andy' of https://github.com/nt46/Imagic into Andy

Conflicts:
	db/development.sqlite3
	log/development.log