removed conflicts after merge
Merge branch 'dev' of github.com:drupaldevel/vd into dev
remove bootstrab from submodule
added bootstrap
optimized bootstrap to current css
optimized bootstrap to current css process.inc