Merge remote-tracking branch 'origin/master'

Conflicts:
	source/routes/main.js
css is automatically changed due to CRLF
add code to create a test page
Merge branch 'master' of https://github.com/xdfcn/items
Merge branch 'feivorid'
Merge branch 'master' of https://github.com/xdfcn/items