started refactoring
Merge branch 'dev' of https://github.com/Cigg/Game-on-Mobile-Cluster into dev