Merge remote-tracking branch 'upstream/master'
version 0.9.6
0.9.7

fix some critical bugs
Merge branch 'master' of https://github.com/dredkin/TorrentMonitor into update
Merge branch 'master' of https://github.com/ElizarovEugene/TorrentMonitor into update

Conflicts:
	action.php
	class/Database.class.php
	js/user-func.js