Adding UI Tests
Merge branch 'master' of github.com:hosamaly/makanak

Conflicts:
	spec/models/site_spec.rb
	spec/requests/sites_spec.rb