New
Merge branch 'master' into I2_table_name_in_models

Conflicts:
	model.php
Merge branch 'master' into I2_table_name_in_models
I2 : update function move to answer class from question class
I2 updatecount function move to answer class from question class
T_SL error fixes, Call to undefined method error fix
Removed white line & spaces, Renamed function names, Fixed source indent.
I2: Removed white line & spaces, Renamed function names, Fixed source indent.
Merge branch 'master' into I3_new_profile_page_for_users

Conflicts:
	controllers.php
	model.php