Merge pull request #4 from koush/master

update base
Update strings.xml
Update strings.xml
Update strings.xml
Update spanish translation
Merge pull request #101 from ed10vi/master

Update spanish translation
Merge pull request #100 from alvinhkh/master

update Traditional Chinese translation
small fixes and optimizations
Merge pull request #102 from udK/patch-1

small fixes and optimizations
missing files

Change-Id: I489641830acfa6ede0e17a2e61eaa70a471fb657
apparently some phones crash if a notification is made without a contentIntent

Change-Id: I962a787189910866dea0519acbc4dfe7ea5e5fb1
Merge remote-tracking branch 'upstream/master'