Refactor to models
Merge remote-tracking branch 'upstream/master'
Update models
Merge remote-tracking branch 'upstream/master'
Re-factor admin.js
Merge remote-tracking branch 'upstream/master'
Refactor admin.js
Refactor admin.js
Merge pull request #169 from jerv13/master

Refactor admin.js