Styles modified
Merge branch 'master' of https://github.com/technomicssolutions/emplome
Merge branch 'master' of https://github.com/technomicssolutions/emplome
Controllers modified
Merge branch 'master' of https://github.com/technomicssolutions/emplome
models, controllers and templates modified