stuff not working, might revert.
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014 into Cole
merged with master
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014 into Cole
Attempt at fixing list view scrolling problem
Merge branch 'master' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014 into Cole
Fixed my problem with not pulling from elasticsearch
Merge branch 'Cole' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014