remax14-62 Creating pagination for property listing views
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/app.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/app.js
remax14-62 Creating pagination for property listing views