Fix launch from intent in manifest and attach method in MainActivity to intent launch
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/me/wisespend/wisespend/MainActivity.java
Fix launch from intent in manifest and attach method in MainActivity to intent launch