Merge branch 'fellmeister' into dev
Added API groundwork, fixed up some grunt stuff
Merge branch 'dev' into fellmeister