first commit
Second commit
Third commit
fourth commit
Add test folder
Add test folder
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gruntfile.js
	LICENSE
	README.md
	app/.jsbeautifyrc
	app/index.js
	app/templates/Gruntfile.js
	app/templates/_README.md
	app/templates/_bower.json
	app/templates/_package.json
	app/templates/application/_Application.js
	app/templates/application/_index.html
	app/templates/application/css/style.css
	app/templates/application/i18n/messageBundle.properties
	app/templates/application/model/Config.js
	app/templates/application/model/img.json
	app/templates/application/view/_Main.controller.js
	app/templates/application/view/_Main.view.js
	app/templates/application/view/_Main.view.xml
	app/templates/gitignore
	app/templates/gitkeep
	app/templates/jshintrc
	facelessComponent/index.js
	facelessComponent/templates/application/_Component.js
	package.json
	script-base.js
	test/test-creation-app-classic-xml.js
	test/test-creation-app-classic.js
	test/test-creation-app-fiori-master-detail.js
	test/test-creation-app-fiori-tiles.js
	test/test-creation-app-spa.js
	test/test-creation-facelessComponent.js
	test/test-creation-uicomponent.js
	test/test-creation-view.js
	test/test-load.js
	uiComponent/index.js
	utils.js
	view/index.js
	view/templates/application/view/_Main.controller.js
	view/templates/application/view/_Main.view.js
	view/templates/application/view/_Main.view.xml