all changes

Signed-off-by: avi <avadhoot@pyxis.co.in>
Merge branch 'master' of github.com:TraXex/rop

Conflicts:
	app/views/fashions/index.ctp
	app/views/fashions/news.ctp
	app/views/layouts/three-column.ctp