Integrated assets and did layout changes
Merge branch 'master' of https://github.com/akarapetyan/RocknRoll

Conflicts:
	bb10_client/src/RocknRoll.cpp