added croutontext
Merge branch 'master' of https://github.com/HelloWorld017/Circuit-Cu

Conflicts:
	res/values/messages.xml