Merge pull request #64 from indykish/master

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

TOSCA designer initial changes
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
pkgr
pkgr
pkgr
pkgr
Merge pull request #68 from thomasalrin/master

pkgr
debian bundle changes