conversations - copy of conversations repo

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into introduce_cplus_database_version	steckbrief	2016-04-18	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \|	Conflicts: gradle/wrapper/gradle-wrapper.properties src/main/res/values/strings.xml
\| *	update gradle and gradle plugin	Daniel Gultsch	2016-04-09	1	-2/+2
\| \|
* \|	DatabaseBackend updated to serve Conversatiosn Database version and ↵	steckbrief	2016-04-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conversations+ Database version HttpUpload Flag introduced for message to identify if a link was sent after httpupload message hint for httpupload added (message parsing and message generating)
* \|	changed distribution url due to bug: ↵	lookshe	2015-04-11	1	-1/+1
\|/ \| \| \|	http://stackoverflow.com/questions/29576097/gradle-sync-error-in-android-studio-when-importing-project/29576568#29576568
*	update gradle to 2.2.1 and android gradle plugin to 1.0.0	Michael	2014-12-09	1	-1/+1
\|
*	update android gradle plugin to 0.14.4	Michael	2014-11-22	1	-2/+2
\| \| \| \| \|	to work with AS >= 0.9.0 plugin >= 0.14.0 is required also update gradle to 2.2.
*	Add gradle directory	Sam Whited	2014-10-22	2	-0/+6