Merge branch 'master' of https://github.com/onesup/cqds
0728 property
Merge branch 'master' of https://github.com/jihoonLee/cqds

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