change the javascript config structure
Merge pull request #26 from czx0619/dev

update third right UI
new template for jstorm
add jquery-ui/jquery-validation lib to git to avoid network jam
merge from msopentechcn branch
template for jStrom
Merge pull request #27 from juniwang/dev

add and test template for jstorm hackathon
Merge remote-tracking branch 'upstream/dev' into dev

Conflicts:
	osslab/src/app/templates/third.html