improved coding quality
Merge branch 'master' of https://github.com/ColdTrick/elgg-questions

Conflicts:
	languages/en.php