Fix display of deployed version
Merge branch 'master' into user_interface
Merge branch 'user_interface' of https://github.com/ASE2014/elis into user_interface