issue#195 - fixed conflict
issue#196 - keep footer always bottom and clean style.css file
Merge pull request #430 from kevin000/issue#196

Issue#196 - keep footer always bottom and clean style.css file