Merge commit '65c01112227a8755ebfd7500f8842fd04ef1046a'
Merge commit 'f93a98343c2a6c53bc81da1a49ab446d4f93213c'
Merge commit '60962aedd37d6ce6787460950aae00f2a27f8ae3'
Merge commit '151be16b9062063f3381bcc7e22a9d55b877beb8'
Merge commit '4d6d6f8bc835822b740111c2d58acd7a9cb5d50f'
Merge branch 'master' of https://github.com/MirakelX/mirakel-android
Try to fix travis(again)