added ca
Merge branch 'master' of https://github.com/japuga/sample

Conflicts:
	state.properties