etc_controller
Merge branch 'master' of https://github.com/ggomagundan/todpop

Conflicts:
	app/controllers/api/etc_controller.rb