fixed action bar theme issue below api 11
nested if
merged with latest upstream
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/src/main/java/im/tox/antox/MainActivity.java
Merge remote-tracking branch 'upstream/master'
updated icon and logo
Merge remote-tracking branch 'upstream/master'
Don't send notification when looking at the friends list
Merge remote-tracking branch 'upstream/master'
Don't show timestamp in left pane if no messages yet
Added layout dimentions.
Merge remote-tracking branch 'upstream/master'
Standaridzed margins and text sizes.
Standarized colors
added permisions for vibration
Merge pull request #165 from strider29/master

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

scroll the chat messages up when the keyboard is opened