Main page
Merge branch 'master' of https://github.com/mahyamaftouni/TG

Conflicts:
	Resources/android/alloy/controllers/year.js
	Resources/android/alloy/styles/year.js