Merge pull request #542 from herby/folder-structure

Folder structure
renamed amber4browser.js to amber.js
Merge remote-tracking branch 'upstream/master' into requirejs-wip

Conflicts:
	index.html