Project structure
Merge branch 'master' of https://github.com/pasviegas/jellybean

Conflicts:
	jellybean.iml