Tiny changes (logging + ip)
Merge branch 'master' of https://github.com/mobileciber/omozonApp2.git

Conflicts:
	assets/www/js/main.js
	assets/www/js/model/User.js
Merge branch 'master' of https://github.com/mobileciber/omozonApp2.git