wip
small fix
Merge branch '20140709-join' into 20140711-employers
add employers flow and employers router