Merge pull request #117 from BNoiZe/master

Fixes for installtion screen
Merge branch 'master' of https://github.com/BNoiZe/Froxlor

Conflicts:
	templates/Sparkle/assets/css/main.css
Removed error file created by git
CSS tweaks
Merge branch 'master' of git://github.com/Froxlor/Froxlor
Merge branch 'master' of https://github.com/BNoiZe/Froxlor
Merge pull request #118 from BNoiZe/master

CSS tweaks