gemfile update
Merge branch 'develop' into feature/uml

Conflicts:
	Gemfile.lock
fixed conflict
Added railroady to generate uml for documentation
refactored user
Brakeman less chatty
changes to controller [ci skip]
updated courses
tests for order_transaction
preliminary data for transaction
added OrderTransactionObserver stub
Refactored user, and added tests for order_transaction