merge conflict
plugin initializing correctly etc.

Conflicts:
	sites/ucsf/js/phonegap/phonegap.src.js
Angular 1.1.4 so we can use transitions