Merge pull request #1568 from seanpaultaylor/next

Fixes for Android Eclipse template files
Updated Xcode 6.1 project defaults for MacOSX 10.10 and iOS 8.1