Merge pull request #1 from wwojcik/develop

Opis projektu
formatting
Merge remote-tracking branch 'upstream/master' into develop
remove php 5.3.3
Merge pull request #2 from wwojcik/travis

Travis