test
dev2 test1
Merge remote-tracking branch 'origin/dev'

Conflicts:
	blox/src/com/blox/test/mummy/Mummy.java
test1
test2
test2
Update .gitignore
Update .gitignore
removed gen/
Merge branch 'mergeToMaster'

Conflicts:
	blox-android/AndroidManifest.xml
	blox-android/src/com/blox/MainActivity.java
	blox/src/com/blox/test/mummy/Mummy.java
Merge branch 'devToMaster'
framework architure begin
framework develeopment