uu
uu
Merge branch 'master' of https://github.com/aliamaz/aliamaz.git
Merge branch 'master' of https://github.com/aliamaz/aliamaz.git

Conflicts:
	aliamaz-phonegap/www/config.xml
	aliamaz-phonegap/www/index.html