Merge pull request #33 from XiDevelopment/master

To Master
Social Tab working.
- Add Friend
- Remove Friend
- List Friends
- Show Details

Added AppFacade.java. in core
Added Friend.java. in model
Added gps functionality
Merge pull request #34 from XiDevelopment/michi

Added gps functionality
Merge branch 'master' into adi-dev

Conflicts:
	Project/BikeChallenge/app/src/main/java/at/xidev/bikechallenge/app/FragmentDrive.java
	Project/BikeChallenge/app/src/main/java/at/xidev/bikechallenge/app/MainActivity.java
	Project/BikeChallenge/app/src/main/res/values/strings.xml
Update BikeChallenge.iml
Update BikeChallenge.iml
Update app.iml
Merge pull request #35 from XiDevelopment/adi-dev

SocialTab
put social menu inflater into comments for a running version until the social menu.xml gets merged
put remaining files on ignore list
Merge branch 'master' into rick

Conflicts:
	Project/BikeChallenge/app/app.iml
	Project/BikeChallenge/app/src/main/AndroidManifest.xml
	Project/BikeChallenge/app/src/main/java/at/xidev/bikechallenge/app/MainActivity.java
	Project/BikeChallenge/gradle/gradle.iml