Various fixes, including infinity bug
Merge branch 'master' of github.com:rss-2014-team-6/rss-team-6-localization