merged changes from pro version
Merge remote-tracking branch 'origin/master'

Conflicts:
	backwpup.php