Signed-off-by: FusinThang <fusinthang@gmail.com>
Merge branch 'master' of https://github.com/FusinThang/dat_com

Conflicts:
	log/development.log
Update admin page
add some gems
update rspec
nothing new here