1. move the query to be ajax (when possible)
2. various fixes
remove the my sql example
Merge branch 'develop'