sync also build
add build back
modules split
Merge branch 'master' of https://github.com/dmitriz/ui-router

Conflicts:
	sample/factory.js