fixed issues with new setting new states
Merge branch 'master' of https://github.com/CrossroadsAndroid/AndroidApp