Mobility still in progress
Merging...
Merging...
Merge branch 'resourceAuth' of github.com:smartcampuslab/android.smartcampus.template.standalone into resourceAuth

Conflicts:
	src/eu/trentorise/smartcampus/template/mobility/fragments/MobilityMainFragment.java
Merging