property finish
1015mobile
Merge branch 'master' of https://github.com/jihoonLee/cqds

Conflicts:
	app/views/m/index.html.erb