Merge pull request #1 from osmandapp/master

Updating my fork, if this will go wrong than sorry ;/
Reformating of the code.

This will not change in the layout, it's here just to better maintain
the code.
Merge pull request #956 from ireun/master

Reformating of the code