Merge tag '1.2.0' into trz/master

Conflicts:
	src/main/java/eu/siacs/conversations/parser/AbstractParser.java
	src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
	src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
	src/main/res/values-de/strings.xml
	src/main/res/xml/preferences.xml

1 files changed, 23 insertions, 0 deletions

diff --git a/todo.md b/todo.md
new file mode 100644
index 00000000..bace5987
--- /dev/null
+++ b/todo.md
@@ -0,0 +1,23 @@
+##GSOC teaser tasks
+
+####update Contacts last seen for muc messages as well
+The contact class (entities/Contact) has the ability to save the last time that Conversations
+  received a message from that contact. Currently this time only gets updated for one-on-one
+  messages. In non-anonymous mucs messages from a contact should also update the last seen
+  time.
+
+####Select multiple Contact in Choose Contact Activity
+Currently the choose Contact activity allows only for one contact to be selected. A long
+press on one contact should bring the activity in a mode where the user can select multiple
+contacts.
+The Activity should then return an array of contacts instead of just one
+
+####Request and respond to message receipts in MUC PNs
+Private MUC messages either dont request message receipts or dont respond to them. The source
+of error should be determined and eliminated. A rather small tasks that just teaches you a bit
+about the stanza parser and generator in Conversations
+
+####Edit dynamic tags / groups
+The context menu for the contact list (StartConversationActivity) should offer the ability to
+edit groups. (Any UI decissions are left to you) Quick suggestion though: Dialog with
+checkboxes for existing groups and some way to enter new tags.