remove unused app/views/admin/upload.html.erb file
[ISSUE #183][WIP] fixes facebook button
removed admin/import_csv from routes
[issue #170] [WIP] solving conflicts with other game related branches after adding some features
modify admin add word view
modify routes /admin/wordadd to /admin/addword and change button in addword form to pull-left
fixed conflicts
fixes conflicts
changed developer_id with owner_id in projects controller to fix error
[issue #181][WIP] handled cancel button exception
fixed tabs history with js
[ISSUE #183][WIP] adds spec files for testing
add alert timeout event to fade out after 5 seconds
[issue #170] [WIP] solving conflicts with the game related views and backend and the suggesting synonym story
 added gender to mass asign
fixing merge conflicts
fixing conflicts
[#173] [WIP] add form for adding a new trophy and add controller action
[#182] [WIP] add new prize form and add controller action
[Issue #195][WIP] modified translations in the translation yml files