controllers and Jquery base.css modified
Merge branch 'master' of https://github.com/technomicssolutions/emplome