initial commit
Merge http://github.com/anetfreak/tackit

Conflicts:
	.project
Merge http://github.com/anetfreak/tackit

Conflicts:
	.project
	WebContent/css/bootstrap.css
	WebContent/css/bootstrap/bootstrap-responsive.css
	WebContent/css/bootstrap/bootstrap-responsive.min.css
	WebContent/css/bootstrap/bootstrap.css
	WebContent/css/bootstrap/bootstrap.min.css
	WebContent/css/round-about.css
	WebContent/images/bootstrap/glyphicons-halflings-white.png
	WebContent/images/bootstrap/glyphicons-halflings.png
	WebContent/index.jsp
	WebContent/js/bootstrap.js
	WebContent/js/bootstrap/bootstrap-alert.js
	WebContent/js/bootstrap/bootstrap-button.js
	WebContent/js/bootstrap/bootstrap-carousel.js
	WebContent/js/bootstrap/bootstrap-dropdown.js
	WebContent/js/bootstrap/bootstrap-modal.js
	WebContent/js/bootstrap/bootstrap-scrollspy.js
	WebContent/js/bootstrap/bootstrap.js
	WebContent/js/bootstrap/bootstrap.min.js
	WebContent/js/global.js
	WebContent/js/jquery.js