Trying to fix
Merge branch 'master' of git@github.com:smartcampuslab/smartcampus.vas.roveretoexplorer.android.git
Merge branch 'master' of
git@github.com:smartcampuslab/smartcampus.vas.roveretoexplorer.android.git

Conflicts:
	RoveretoExplorer/src/eu/iescities/pilot/rovereto/roveretoexplorer/fragments/event/info/Fragment_EvDetail_Info.java
	RoveretoExplorer/src/eu/iescities/pilot/rovereto/roveretoexplorer/fragments/event/info/edit/Fragment_EvDetail_Info_What.java