Set
Updated tests and began building base module for javascript / css objects to use
Merge branch 'development'