Merge branch 'master' of github.com:weimenlove/common_rep

Conflicts:
	app/app_rules.mk
Merge branch 'master' of github.com:weimenlove/common_rep

Conflicts:
	app/app_rules.mk