Added angular
Added active model serializer gem
Added term2 and term3 to search model
Added serializer for search model and some API json in searches_controller
Resolved merge conflicts