update controllers and models with route
Merge branch 'master' of github.com:Lawliet-L/smartphone

Conflicts:
	inc/smartphone.js