add edit activity, minor fix
Merge branch '2014_2_19_newSM' of
git@github.com:smartcampuslab/smartcampus.vas.corsi.android.git into
2014_2_19_newSM