Refactor to models
Merge remote-tracking branch 'upstream/master'
Update models
Merge remote-tracking branch 'upstream/master'
Fix deplay script and clean up admin dir
Merge pull request #167 from wshafer/master

Clean up admin dir
Re-factor admin.js
Merge remote-tracking branch 'upstream/master'
make plugins dragable
make plugins dragable
Refactor admin.js
Refactor admin.js
fix local issues
Merge pull request #170 from rodmcnew/locale

fix local issues
Merge pull request #169 from jerv13/master

Refactor admin.js
Merge pull request #168 from rodmcnew/drag

make plugins dragable
Merge remote-tracking branch 'upstream/master' into brians-playground