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

Conflicts:
	src/eu/trentorise/smartcampus/jp/HomeActivity.java