From b439db5f9fb843cf7d6212bc0a360e3bca7c536a Mon Sep 17 00:00:00 2001
From: MikeCoder <mikecoder13@gmail.com>
Date: Sat, 31 May 2014 19:27:47 +0800
Subject: [PATCH] Merge branch 'master', remote-tracking branch 'lctt/master'