Still fixing partners
Merge branch 'master' of https://github.com/kishandchips/ivip

Conflicts:
	css/editor-styles.css
	css/style.css