Added support for iPhone 6 and iPhone 6+
Merge branch 'v2.0'

Conflicts:
	calculator.appcache
	js/script.js