add modal for file loading
Merge branch 'master' into audio_modal

Conflicts:
	log/development.log
	tmp/pids/server.pid
Merge pull request #16 from gsperka/audio_modal

add modal for file loading