Added emacs and wuala app icons, added R and Scala mimetypes
Merge pull request #19 from djrm/master

Added emacs and wuala app icons, added R and Scala mimetypes
Adjusted Scala mimetype to fit the included template
Added basic, gpm, xfpm and notification icons for battery status
Merge pull request #20 from pacomaro/master

Added basic, gpm, xfpm and notification icons for battery status
Update CONTRIBUTORS
Merge remote-tracking branch 'upstream/master'