a
Merge branch 'master' of https://github.com/mszkodzinski/19115
Merge branch 'master' of https://github.com/mszkodzinski/19115
Merge branch 'master' of https://github.com/mszkodzinski/19115
Api dla współrzędnych
Merge remote-tracking branch 'origin/master'

Conflicts:
	library/Api/Engine.php