Database merged with dev
Merge branch 'development' of https://github.com/DigohD/SE-Android into development

Conflicts:
	res/layout/menu_tab_view.xml