Merge pull request #3 from jacopocafarelli/layout_definition

Layout definition
Change config files
Merge branch 'master' into navigation_drawer_setup

Conflicts:
	app/app.iml
Change based on review