remove empty p tags from conversion area
Merge branch 'master' of https://github.com/inboundnow/landing-pages
update css and short codes
Merge branch 'master' of https://github.com/inboundnow/landing-pages

Conflicts:
	shared/classes/menu.class.php
	shared/metaboxes/inbound-metaboxes.css
fix datepicker
Merge branch 'master' of https://github.com/inboundnow/landing-pages

Conflicts:
	shared/inbound-shortcodes/inbound-shortcodes.php