new structure
Merge remote-tracking branch 'origin/master'

Conflicts:
	appcompat/appcompat.iml
	assets/www/index.html
conectare review