Fixed issues found by XCode.
Merge branch 'master' into Qt5.2_macx
Removed file wrongly added.
Tries to fix android sdk installation in Travis
Include c++11 threading