Merge branch 'master' of github.com:schrockblock/julintani-ccny-server
Merge branch 'master' of github.com:schrockblock/julintani-ccny-server
Merge branch 'master' of github.com:schrockblock/julintani-ccny-server
added urban airship, users, auth, and admin
added needed ransack gem
fixed news routes and controller
added actions to device controller
Merge branch 'master' of ssh://julintaniccny-rndapp.rhcloud.com/~/git/julintaniccny