Merge commit '7d1559e48e5656da85934a9b084364447ad1d001'
Merge commit 'e95572d795202cbc79ee58306f3f51a66f21c576'
Merge commit '520eea2d25022f58bf0175f1220ef3c7b04e345d'
just put back the code not related to splash and dev/run
Merge branch 'master-mk01'
Update README.md
Update init
Update README.md
Merge branch 'master' of https://github.com/xbianonpi/xbian-initramfs into master-mk01

Conflicts:
	README.md
	init