Merge pull request #59 from unepwcmc/upgrade-ember-rc6

Upgrade to ember rc6
renamed official_language to convention_language
Merge branch 'landing_page' of github.com:unepwcmc/SAPI into landing_page