Merge pull request #54 from ChaeOkay/testing

Testing
add new js libraries
update color js
add touch function to slider
remove button
remove button
add js shakejs and jqueryuiipad
Merge pull request #55 from ChaeOkay/lampsPage

Lamps page
refactor controller lamp and updated tests
Merge branch 'master' into testing