Recent Rug paging changed
Few Fixes
Merge Commit
Merge branch 'master' of https://github.com/himanverma/openrug.com

Conflicts:
	app/View/Elements/page-header.ctp
	app/View/Rugs/editor.ctp
	app/webroot/css/style.css
Updated
Few Fixes
By Color and By Shape