Some changes
Merge branch 'master' of github.com:Akravish/magento_p

Conflicts:
	app/design/frontend/urbandecay/default/layout/customer.xml
	app/design/frontend/urbandecay/default/layout/page.xml
Updated homepage slider. Style changes
Merge branch 'master' of github.com:Akravish/magento_p