Beginning stages of the replacement FileMaker Pro
updating some things
Merge branch 'master' into volume-dashboard
Renamed internal plugin to Magazine Dashboard. Working on SQL for pulling in the postmeta from EditFlow into our table
taking a break on this script to address other stuff.
progress...
More style and layout changers for maker training camp
Merge branch 'training-camp'
Merge branch 'master' of https://github.com/Make-Magazine/makeblog
getting there...
Camp styles were changed that broke the new pop-down menu. Refixing that…
Adding new popdown menu to all pages on makezine.com
Padding tweak for blue button on training camp
For some reason this came through after SVN UP
Merge branch 'training-camp'
stuff
Merge branch 'master' into volume-dashboard
Design tweaks to maker camp main nav bar
Darken IE Comment that keeps reappearing
Merge branch 'maker-camp'

Conflicts:
	css/style.css
	less/make/makercamp.less