last found error
Minor change others still in progress
Merge remote-tracking branch 'origin/master' into pr/4

Conflicts:
	gen/com/myapps/playnation/R.java
	src/com/myapps/playnation/Adapters/NotificationAdapter.java
	src/com/myapps/playnation/Classes/Keys.java
	src/com/myapps/playnation/Operations/BundleBuilder.java
	src/com/myapps/playnation/Operations/ContentVBuilder.java
	src/com/myapps/playnation/Operations/ServiceClass.java
	src/com/myapps/playnation/login/LoginActivity.java
	src/com/myapps/playnation/main/MainActivity.java
Merge pull request #5 from codez2love/pr/4

Pr/4