1

Signed-off-by: mxr1027 <maxinrui1027@gmail.com>
Merge branch 'development' of https://github.com/hujunyi/clipus into development

Conflicts:
	home.html
change header content position

Signed-off-by: mxr1027 <maxinrui1027@gmail.com>