Merge pull request #468 from LoungeKatt/master

Remove some test changes, Use drawable swap function
updated travis.yml with recent build steps
updated apk path in travis.yml, not we just need a working host for uploading the builds
build badge!
i loves me some markdown
Update strings.xml
CloudVMU tool added
Echo state on websocket, hack abit the nacl makefile
Split CFLAGS/CXXFLAGS on core.mk, warning fixes
Merge pull request #470 from coestergaard/patch-3

Update strings.xml
Merge pull request #474 from Luca1991/master

CloudVMU tool added
Disable info display by default until internet check works