push -design
Merge branch 'master' of github.com:inoukb/opengram

Conflicts:
	mobile/android_native/src/net/opengram/PreviewActivity.java