Simplify Bootstrap import
Preserve TWBS2 specific stuff
Preserve bs2 files
Fix problem with install script
update to express4

Signed-off-by: Dominic Böttger <Dominic.Boettger@inspirationlabs.com>
express4 upgrade

Signed-off-by: Dominic Böttger <Dominic.Boettger@inspirationlabs.com>
file upload

Signed-off-by: Dominic Böttger <Dominic.Boettger@inspirationlabs.com>
missing express static

Signed-off-by: Dominic Böttger <Dominic.Boettger@inspirationlabs.com>
Added file upload

Signed-off-by: Dominic Böttger <Dominic.Boettger@inspirationlabs.com>
changed test url's

Signed-off-by: Dominic Böttger <Dominic.Boettger@inspirationlabs.com>
Merge branch 'master' of github.com:mchapman/forms-angular into testing

Signed-off-by: Dominic Böttger <Dominic.Boettger@inspirationlabs.com>

Conflicts:
	app/css/forms-angular.less
	app/index.html
	app/js/controllers/base.js
	bower.json
	server/server.js
final merges and server.js fixes

Signed-off-by: Dominic Böttger <Dominic.Boettger@inspirationlabs.com>
Merge remote-tracking branch 'origin/testing'