Sites handling
Merge remote-tracking branch 'origin/master'

* origin/master:
  changing in screeshot library
  changing in screeshot library

Conflicts:
	server/app.js