Removed some warnings
Using a dialog instead of the add activity.
Created the changelog text.
Merge branch 'dev'

Conflicts:
	assets/data/version.dat