sqlite3 -> development
Merge branch 'master' of github.com:allmonday/frameword_ror