Moved script files to the end of the document to fix https://bugzilla.redhat.com/show_bug.cgi?id=1011275
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	app.js
Moved script files to the end of the document to fix https://bugzilla.redhat.com/show_bug.cgi?id=1011275