update content, faq, news, change password
Merge branch 'develop' of https://github.com/afoursatria/ta2014 into develop

Conflicts:
	protected/views/user/_formChangePassword.php