removing files from repo that should never have been checked in (and have now been ignored)
fixes for tickets found in sprint 60
update manifest for production release 2013.60 - will tag this version
Committing files with line ending changes just so I can merge
Merge branch 'master' of github.com:ACSTechnologies/ChurchLife-Android into bugfixes

Conflicts:
	com.acstech.churchlife/src/com/acstech/churchlife/SimpleCryptography.java