Re-indent files according to convention of the project (2 spaces instead of 4).
Fix catch and else new line convention to match project's coding convention.
Merge pull request #267 from amitapl/dev

Re-indent files according to convention of the project