Merge branch 'hotfix-1.0.3'
fixed redirection
Merge branch 'dev'
changed ajax deferred methods to "done", "fail", "always"
Merge branch 'master' into dev
fixed one js bug and reverted to success/error/complete paradigm
Merge branch 'dev'
Fixed a bug that prevented multiple categorizations under different topics and feeds
Now the fetching process returns the number of resources found under different topics
Separated login style in a linked file
Changed style for the message returned after Fetch
commit
Added type check to prevent feeds unlink bug
added folder to git ignore
merged dev into master.
fixed menu icos for admin
Merged into dev.
Merge branch 'dev'
Rewritten theme scheme in style.css
Merge branch 'dev'