Merge pull request #3 from GiantSusus/master

Updates
New version
Cleared old files
Deleting files
Location updates
Updated server host
Merge branch 'johans'
Merge branch 'master' of https://github.com/GiantSusus/FriendStalker

Conflicts:
	Android_app_johan/src/main/java/com/nizzon/assassins/app/HttpTask.java
	Android_app_johan/src/main/java/com/nizzon/assassins/app/JSONParser.java
	Android_app_johan/src/main/java/com/nizzon/assassins/app/MainActivity.java
	Android_app_johan/src/main/java/com/nizzon/assassins/app/UserFunctions.java
	Android_app_johan/src/main/res/layout/activity_main.xml
	Android_app_johan/src/main/res/menu/main.xml
	Android_app_johan/src/main/res/values/strings.xml
	androidapp/assassins/bin/classes/android/support/v7/appcompat/R$attr.class
	androidapp/assassins/bin/classes/android/support/v7/appcompat/R$bool.class
	androidapp/assassins/bin/classes/android/support/v7/appcompat/R$color.class
	androidapp/assassins/bin/classes/android/support/v7/appcompat/R$drawable.class
	androidapp/assassins/bin/classes/android/support/v7/appcompat/R$integer.class
	androidapp/assassins/bin/classes/android/support/v7/appcompat/R$style.class
	androidapp/assassins/bin/classes/android/support/v7/appcompat/R$styleable.class
	androidapp/assassins/bin/classes/com/naegling/assassins/BuildConfig.class
	androidapp/assassins/bin/classes/com/naegling/assassins/R$color.class
	androidapp/assassins/bin/classes/com/naegling/assassins/R$style.class
	androidapp/assassins/bin/dexedLibs/android-support-v4-4ff933654a45f7caeb4d7898b57e7b26.jar
	androidapp/assassins/bin/dexedLibs/android-support-v7-appcompat-cd1e1290d20be9b090216c95749e5b99.jar
	androidapp/assassins/res/values/styles.xml