Merge branch 'release/v1.0.0'
Merge branch 'release/v1.1.0'
Merge branch 'release/v1.2.0'
Started bootstrap undo view
Started bootstrap undo view
Somewhat buggy basic working undo view
Merge branch 'develop' into feature/undo/bootstrap
Merge branch 'feature/undo/bootstrap' of github.com:Derkje-J/programming-life into feature/undo/bootstrap

Conflicts:
	app/assets/javascripts/views/main.js.coffee
	app/assets/javascripts/views/pane.js.coffee
	app/assets/stylesheets/main.css.scss
Forgot to git add
Made undo a little more functional
Added POST variables to PDF generation
Added report generation button
Merge branch 'feature/notifications' into develop
Re-Add EventBindings spec test
More functional stuff
Better test failure message for modules
Merge branch 'feature/notifications' into develop

Conflicts:
	app/assets/javascripts/models/module._.js.coffee
Merge branch 'develop' into feature/graph/animate
Added viewbox animation to graphs
Added viewbox animation to graphs