init
hold
ref
Merge branch 'master' of https://github.com/aliamaz/aliamaz.git

Conflicts:
	aliamaz-phonegap/WebContent/config.xml
	aliamaz-phonegap/WebContent/js/index.js