Made level 5
Merge branch 'master' of
https://github.com/oskarwaglund/project-pineapple.git

Conflicts:
	Pineapple/bin/Pineapple.apk
	Pineapple/bin/classes.dex
	Pineapple/bin/dexedLibs/android-support-v4-20297fdaf6ed25ec950694f12980e4b2.jar
	Pineapple/bin/dexedLibs/android-support-v4-ef9b2a626986d258506eb4246c9e56fd.jar
	Pineapple/bin/resources.ap_