Merge pull request #1 from mariodu/master

index page frontend
jquery file uploader
merge