New icons and some colors
Merge branch 'master' of
https://github.com/smartcampuslab/smartcampus.vas.trentinofamiglia.android.git

Conflicts:
	res/values/styles.xml
	src/eu/trentorise/smartcampus/trentinofamiglia/custom/CategoryHelper.java