Initial commit
Merge branch 'master' of github.com:jmachete/androidhibrid

Conflicts:
	.gitignore