Design of main menu #52
Merge branch 'dev' of https://github.com/oSoc14/Artoria into dev

Conflicts:
	app/src/main/res/values/dimens.xml
Merge branch 'dev' of https://github.com/oSoc14/Artoria into dev
implementing design #52