update widgets
Merge branch 'master' of
https://github.com/smartcampuslab/android.widget.git

Conflicts:
	res/values/strings.xml