20140711
Merge branch 'master' of https://github.com/prequiem/cbims

Conflicts:
	cbims/cbims/cbims.log
	cbims/question/views/question/add.py