Merge branch 'master' into I4_Common_functions_to_refactor

Conflicts:
	controllers.php
	model.php
I4: save and getById functions moved to Model class
Merge branch 'I4_Common_functions_to_refactor' of https://github.com/atulga/qanda into I4_Common_functions_to_refactor

Conflicts:
	controllers.php
	model.php