Merge templating
add organization ajax list
add organization ajax list
add routing
Merge dev-master