pause 안돼는 문제 수정
Merge branches 'master' and 'master' of github.com:legoProject/lego-matrix

Conflicts:
	src/com/bulgogi/bricks/activity/MainActivity.java