restructuring. WIP
Merge branch 'master' of https://github.com/boukeversteegh/nebula into ui-restructuring
restructuring complete, testing needed. added onload and onrender events to views
removed script from tpl
Merge branch 'folderupload'
Merge branch 'folderupload'