reorganized locations of external libraries
Merge branch 'master' of github.com:lukhar/memento

Conflicts:
	src/main/python/memento/static/lib/bootstrap/css/bootstrap-theme.css
	src/main/python/memento/static/lib/bootstrap/css/bootstrap-theme.css.map
	src/main/python/memento/static/lib/bootstrap/css/bootstrap-theme.min.css
	src/main/python/memento/static/lib/bootstrap/css/bootstrap.css
	src/main/python/memento/static/lib/bootstrap/css/bootstrap.css.map
	src/main/python/memento/static/lib/bootstrap/css/bootstrap.min.css
	src/main/python/memento/static/lib/bootstrap/fonts/glyphicons-halflings-regular.eot
	src/main/python/memento/static/lib/bootstrap/fonts/glyphicons-halflings-regular.svg
	src/main/python/memento/static/lib/bootstrap/fonts/glyphicons-halflings-regular.ttf
	src/main/python/memento/static/lib/bootstrap/fonts/glyphicons-halflings-regular.woff
	src/main/python/memento/static/lib/bootstrap/js/bootstrap.js
	src/main/python/memento/static/lib/bootstrap/js/bootstrap.min.js