Add date and time picker
Merge remote-tracking branch 'origin/master'

Conflicts:

	Code/FriendFinderApplication/src/com/summerschool/friendfinderapplication/activities/MapActivity.java
Merge branch 'master' of https://github.com/RTiK/FriendFinderProject