Delete failed message when resending it
Merge remote-tracking branch 'origin/master'

Conflicts:
	ICSSMS/src/main/java/com/androidproductions/ics/sms/SmsViewer.java
Fixed a bunch of linting issues
Made all the final things final