nested if
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/src/main/java/im/tox/antox/MainActivity.java
Merge remote-tracking branch 'upstream/master'
Don't show timestamp in left pane if no messages yet
Merge remote-tracking branch 'upstream/master'
added permisions for vibration
Merge pull request #165 from strider29/master

vibration permission
scroll the chat messages up
Moving doTox() to a seperate service
Merge pull request #166 from strider29/master

scroll the chat messages up when the keyboard is opened
Merge remote-tracking branch 'upstream/master'