Updated Main Page and implemented navigation Bar
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/ninja/PanicHelper/MainActivity.java