Minor fixes
Merge branch 'production' of https://github.com/vinsol/iconfconnect-web-app into production