Merge pull request #1567 from seanpaultaylor/next

Fixes in Eclipse project for Linux
Fixes for Android Eclipse template files