Got pictures working?
Merge branch 'master' of https://github.com/Jberlinsky/Assassins

Conflicts:
	www/js/controllers.js
	www/js/functions.js
Merge branch 'master' of https://github.com/Jberlinsky/Assassins

Conflicts:
	platforms/android/assets/www/js/controllers.js
	platforms/android/assets/www/js/functions.js
	platforms/android/assets/www/templates/profile.html
	platforms/android/assets/www/templates/target.html
	platforms/ios/www/js/controllers.js
	plugins/android.json
	www/js/functions.js