Update 20140921A

Fixed:
  - New lines?
  - Makefile sleep for CI
Merge branch '0.2.0-devel' of https://github.com/AOSC-Dev/Anthon-Starter into 0.2.0-devel

Conflicts:
	Makefile