notification changes
conflict removed
notification module complete
Merge branch 'development' of github.com:railskipl/drive into development