Testing github commit
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
removed githubtest.txt
Merge remote-tracking branch 'upstream/master'
lab task list
Merge remote-tracking branch 'upstream/master'
Localization Prototype
Merge pull request #2 from madjor5/Localization

Localization Prototype
Updated readme and lab tasks
Localization removed from filter and added to $scope
Makes grunt watch, watch /src /test and /docs for all files
Removes noizy debugging code from app.controller
Localized index.html
Localization returns language via getLanguage()
Merge commit '9b0273e57058d1ff17fd886db6fc77f594e40f1e' into Localization

Conflicts:
	Umbraco.Belle.Client/build/belle/index.html
	Umbraco.Belle.Client/build/belle/js/umbraco.resources.js
	Umbraco.Belle.Client/src/common/resources/localizationFactory.js
	Umbraco.Belle.Client/src/index.html
Making tree work again
Merge pull request #4 from madjor5/Localization

Localization done with factory and DI
Added $scope.user.locale to localizationFactory
Merge commit '3a34b21f6212228c00d0b7342da343f06340d91f'