Changed "ChangeLog" and Version properties
Changed "ChangeLog" and Version properties
Merge branch 'develop'

Conflicts:
	android/clientbeta/AndroidManifest.xml
	android/clientbeta/clientbeta.iml
	android/libraries/TweetLanesCore/TweetLanesCore.iml
	android/libraries/TweetLanesCore/res/xml/changelog.xml