#BH-8 Fixed
Styled sidebar
Added toolbar
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/org/techteam/bashhappens/gui/activities/MainActivity.java
	app/src/main/res/layout/activity_main.xml
Merged