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'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
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
adds intent to get audio/image/video/files when the send file button is pressed
+receive the data on main_activity, figure out the selected file and its type
Merge of master Astonex/Antox
prototype message with picture/audio
+icons for play/pause audio
make friend request notification actually remove itself on tap
remove another chance of nullpointerexception