Merge branch 'master' of https://github.com/yangting/gritty.git

Change-Id: I138e853fdefea372a96a401a127d3ee618fe8e93
Signed-off-by: Yate <e.yangting@gmail.com>
Merge branch 'master' of https://github.com/yangting/gritty.git

Conflicts:
	src/views/index.html