I12: fix
Merge branch 'I12_Insert_doctrine' of github.com:atulga/qanda into I12_Insert_doctrine

Conflicts:
	forms.php
	models/Hariult.php
I12: Question edit change