Commit
Just Commit

Conflicts:
	app/views/cofiles/show.html.haml
Update New
Merge remote-tracking branch 'upstream/development'
Change Layout Show for Bulletin
Done Edit,New,Form File
Merge pull request #26 from rayguard/master

Update New Update and Form file