changed colors and added boarder dimension
Merge remote-tracking branch 'origin/SimpleUI' into SimpleUI
Merge remote-tracking branch 'origin/SimpleUI' into SimpleUI
changed colors and added boarder dimension
new icons, refactored background icons in main, added new icons to popupmenu, changed name of icons in MenuActivity
new icons, refactored background icons in main, added new icons to popupmenu, changed name of icons in MenuActivity
Merge remote-tracking branch 'origin/SimpleUI' into SimpleUI

Conflicts:
	res/layout/main.xml
	res/values/dimens.xml