move to twitter bootstrap
Update for conversion to bootstrap 2
Merge branch 'master' of https://github.com/dsutton178/whiteflag.git

Conflicts:
	whiteflagServer/src/main/webapp/contentcss/whiteflag.css
	whiteflagServer/src/main/webapp/contenthtml/aboutus.html
	whiteflagServer/src/main/webapp/contenthtml/login.html
	whiteflagServer/src/main/webapp/contenthtml/media.html
	whiteflagServer/src/main/webapp/contenthtml/news.html
	whiteflagServer/src/main/webapp/contentjs/init.js
	whiteflagServer/src/main/webapp/index.html