2.0beta
Merge branch '2.0'

Conflicts:
	notification.txt
Merge branch '2.0'
2.0beta