Made changes in controller and index

Signed-off-by: Thierry <thierry.van.loo.tvl@gmail.com>
Fixing merge
Merge branch 'master' of https://github.com/Jasera/SoftwareDevelopment
Merge branch 'master' of https://github.com/Jasera/SoftwareDevelopment