2.0
2.0
2.0
added config
sample controller
framework
added index
Merge branch 'master' into with-dao

Conflicts:
	.DS_Store