Team UB
move menus
Move Interface

(cherry picked from commit c50d6b9c9905c36d47bc3f06f2ce3ba190f3cc05)

Conflicts:
	res/xml/dashboard_categories.xml

(cherry picked from commit 2e1fc38ab599aa47c7c54d632c4f01dd9ca98965)
(cherry picked from commit b8c018b380c13c22b1ec5de896b32a746b4b4b06)

Conflicts:
	res/xml/dashboard_categories.xml