Modified controleers, views and urls
Merge branch 'master' of https://github.com/technomicssolutions/emplome