Merge branch 'master' of https://github.com/liji/Lollipop.git
rebuid to fix bug
Merge branch 'master' of https://github.com/liji/Lollipop.git

Conflicts:
	README.md