update ruby version
rails 4.2 beta
update netguru theme
update active model serializers

living on the edge is hard
style props list
sort props by id
Merge branch 'rails_42'

Conflicts:
	Gemfile.lock
update bullet gem
return number of props
display no props when there is no props
show gravatars on users list
update js gems
friendly date