Merge pull request #122 from mehere/dev

Pull Request from dev -> dev-wee on 9/3
Merge pull request #123 from mehere/dev

Pull Request from dev -> dev-wee on 9/3
Merge pull request #124 from mehere/dev

approve
Edit Notification.php. Not tested yet
Merge pull request #125 from mehere/dev

Pull Request from dev -> dev-wee on 9/3
Merge branch 'dev-wee' of https://github.com/mehere/RTSS.git into dev-wee
Merge pull request #126 from mehere/dev-wee

Merge changes from dev-wee to dev.