Merge
Merge branch 'master' of https://github.com/MKBid/MKBid-API.git

Conflicts:
	controllers/news_controller.php
	models/news.php