Added alot activiteeeehs
Merge branch 'master' of https://github.com/Firefoxiii/DPBsoft

Conflicts:
	app/bin/R.txt
	app/bin/app.apk
	app/bin/classes.dex
	app/bin/classes/com/dpbsoft/app/LoginActivity.class
	app/bin/classes/com/dpbsoft/app/MainActivity.class
	app/bin/classes/com/dpbsoft/app/R$layout.class
	app/bin/classes/com/dpbsoft/app/R$menu.class
	app/bin/classes/com/dpbsoft/app/R$string.class
	app/bin/classes/com/dpbsoft/app/SplashActivity.class
	app/bin/classes/com/facebook/android/R$layout.class
	app/bin/resources.ap_
	app/gen/com/dpbsoft/app/R.java
	app/gen/com/facebook/android/R.java