Merge pull request #11 from SchizoDuckie/angular

fetch latest updates for my fork
correct settings/display current locale
correct app.js setting of locale
correct app.js use of $translate.proposedLocale

should be $translate.proposedLanguage
clean up SettingService.js changeLanguage()
correct SettingCtrl.js not displaying the determined locale
Merge pull request #198 from garfield69/angular

fix Language vs Locale errors