Fixed bug with menus
Deleting DS_Store
Modifying gitignore to catch all DS_Store files
Added the error templates
Merge branch 'dev'