bringing demo branch into repo.  Will track alongside
the master, and should not be publicly available
adding demo files
adding demo files
adding demo files and merging placeholders.  Should
be up to date at this point

Merge branch 'master' into demo

Conflicts:
	wasp-web/src/main/webapp/WEB-INF/jsp/sections/banner.jsp
moving over demo changes
adding gitignore

Merge branch 'master' into demo
crlf issues
merging in issues

Merge branch 'master' into demo

Conflicts:
	wasp-integration/target/classes/META-INF/MANIFEST.MF
	wasp-web/src/main/webapp/META-INF/MANIFEST.MF
dos2unix
post dos2unix

Merge branch 'master' into demo
Merge branch 'master' into demo
Merge branch 'master' into demo
Merge branch 'master' into demo
Merge branch 'master' into demo
Merge branch 'master' into demo
fixed duplicate filter problem
Merge branch 'demo' of http://frankfurt.aecom.yu.edu/git/wasp/brent into demo
Merge branch 'master' of ssh://frankfurt.aecom.yu.edu/cores/git/wasp/blessedRepository into demo
Merge branch 'master' into demo
Merge branch 'master' into demo
POM updates