popup connection
popup connection
popup connection
Merge branch 'master' of https://github.com/Lotto/HH2K13

Conflicts:
	public/js/crop.js