Updated changelog
Updated to 1.1.8

Conflicts:
	res/values/strings.xml
Removed ads stuff that was mistakenly cherrypicked