delete ds store
Merge branch 'develop' of github.com:bicubic/Bicubic-PHP-Framework into develop

Conflicts:
	.DS_Store
table layout