Merge
Merge branch '2013-11-6_crazy_week' of https://github.com/smartcampuslab/android.journeyplanner.lib.git into 2013-11-6_crazy_week