Env del
Merge branch 'dev' of https://github.com/hajipion/aiai into dev

Conflicts:
	build/iphone/assets/app_js
	build/iphone/assets/ti_cloud_js
	build/iphone/assets/ui/common/ApplicationTabGroup_js
	build/iphone/assets/ui/common/login_js
	build/iphone/assets/ui/common/profile_js
	build/iphone/assets/ui/common/tile_view_js
	build/iphone/assets/ui/common/window1_js
	build/iphone/assets/ui/common/window2_js
	build/iphone/assets/ui/common/window3_js
	build/iphone/assets/ui/common/window4_js
	build/iphone/assets/ui/handheld/ApplicationWindow_js
	build/iphone/assets/ui/tablet/ApplicationWindow_js