Chanhed /key/ -> /word/
init updates
Merge branch 'master' of https://github.com/argeset/set-locale
token adding
Merge pull request #51 from Jupre/master

my words and not translated words service Works.
word service fix
App Id fix
Merge branch 'master' of https://github.com/argeset/set-locale
app id to views fix
validate fix on new translator
View/Admin/Apps conflict fix
Merge branch 'master' of https://github.com/argeset/set-locale

Conflicts:
	src/client/SetLocale.Client.Web/Models/AppModel.cs
	src/client/SetLocale.Client.Web/Views/Admin/Apps.cshtml
user activate deactivate
some changes
some conflict fix
Merge branch 'master' of https://github.com/argeset/set-locale
app status change action added to controller
user apps deactivate activate work
validation fix
Merge branch 'master' of https://github.com/argeset/set-locale