Minor bug fix to support DR in demo mode
docs update
updated the docs
updated readme.
doc changes
Merge pull request #51 from indykish/master

Doc changes, demo user bug fixed.
Merge branch 'master' of https://github.com/thomasalrin/nilavu into thomasalrin-master

Conflicts:
	Gemfile.lock
Merge branch 'thomasalrin-master'
Merge remote-tracking branch 'origin/master'
Angular busy 4.0, remove ngAnimate, promiseTracker, Rails 4.1.1
Merge pull request #64 from indykish/master

Angular busy 4.0, remove ngAnimate, promiseTracker, Rails 4.1.1
TOSCA designer initial changes
Merge pull request #65 from indykish/tosca

TOSCA designer initial changes
Initial visualisations controller
add a designer button
Merge pull request #66 from indykish/master

Add a designer controller for tosca drawing/button
mp addon backup
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile
designer