#12 Rollback fail
#12 Resolved conflict
Merge branch 'dev' of https://github.com/Ornro/ThatNight into dev
#15 T.U. persistence Event