Replaced jQuery with $ variable to use only one jQuery version at the time if a few exists.
Merge branch 'master' of https://github.com/ferrante/prettyphoto
https://github.com/scaron/prettyphoto/pull/118

Conflicts:
	js/jquery.prettyPhoto.js