more unit tests
changing name of main.css to avoid conflict
Merge branch 'develop'
fixed all jshint issues