conflict test
Merge branch 'master' of https://github.com/mahyamaftouni/TG

Conflicts:
	app/controllers/MainPage.js
	app/controllers/index.js
	app/views/index.xml