Final running commit.
Merge branch 'master' of https://github.com/jhiemer/angularjs-requirejs-testacular

Conflicts:
	app/lib/angular/angular-bootstrap-prettify.js
	app/lib/angular/angular-bootstrap-prettify.min.js
	app/lib/angular/angular-bootstrap.js
	app/lib/angular/angular-bootstrap.min.js
	app/lib/angular/angular-cookies.js
	app/lib/angular/angular-cookies.min.js
	app/lib/angular/angular-loader.js
	app/lib/angular/angular-loader.min.js
	app/lib/angular/angular-mocks.js
	app/lib/angular/angular-resource.js
	app/lib/angular/angular-resource.min.js
	app/lib/angular/angular-sanitize.js
	app/lib/angular/angular-sanitize.min.js
	app/lib/angular/angular-scenario.js
	app/lib/angular/angular.js
	app/lib/angular/angular.min.js
	app/lib/angular/jstd-scenario-adapter-config.js
	app/lib/angular/jstd-scenario-adapter.js
	app/lib/bootstrap/bootstrap.min.js
	app/lib/handlebars/handlebars.min.js
	app/lib/ie/ie.js
	app/lib/jasmine/jasmine-html.js
	app/lib/jasmine/jasmine.css
	app/lib/jasmine/jasmine.js
	app/lib/jquery/jquery-1.8.2.min.js
	app/lib/jquery/jquery-ui-1.9.1.datepicker.min.js
	app/lib/moment/i18n/moment.lang-de.js
	app/lib/moment/moment.js
	app/lib/moment/moment.min.js
	app/lib/require/domReady.js
	app/lib/require/require-1.0.8.js
	app/lib/require/require-2.1.0.js
	app/lib/require/require.min.js
	app/lib/require/text.js
	app/lib/underscore/underscore-min.js
	app/lib/underscore/underscore.js
	test/lib/angular/angular-mocks.js
	test/lib/angular/angular-scenario.js
	test/lib/angular/version.txt
	test/unit/controllers/homeControllerTests.js