added new line at the end of file
added new line at the end of file
merged latest commit
Merge branch 'master' of https://github.com/AIFDR/inasafe
Merge branch 'master' of https://github.com/AIFDR/inasafe into data_driven_age
Merge branch 'develop' of https://github.com/AIFDR/inasafe
Merge branch 'master' of https://github.com/essc/inasafe into data_driven_age
Merge pull request #845 from timlinux/master

Apply hotfixes and improvments from develop to fix failing jenkins tests.
Merge branch 'develop' of https://github.com/AIFDR/inasafe
Merge branch 'master' of https://github.com/essc/inasafe into data_driven_age
Merge branch 'develop' of https://github.com/AIFDR/inasafe into data_driven_age
Merge remote-tracking branch 'origin/master' into develop
Set tab default correctly in about box
Merge pull request #849 from timlinux/master

Merge changes from develop ready for 2.0.2 release
Fixes for running tests on ubuntu 13.10 64 bit
Create smaller and reduced pallette images to prevent plugin bundle bloat
Merge pull request #850 from timlinux/master

Fixes for running tests on ubuntu 13.10 64 bit
Use small plugin icon
Merge pull request #851 from timlinux/master

Use small plugin icon
Use inasafe email for contact