Update menu
Merge branch 'master' of https://github.com/360ecommerce/threesixty-wordpress

Conflicts:
	app/code/local/Threesixty/Wordpress/etc/config.xml