History added
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/javascripts/practices.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/javascripts/practices.js

Bug-fix on history create
Bug-fix on history javascript