file dialog added.
Merge branch 'master' of https://github.com/sapphiredev/Project-Akari

Conflicts:
	akari_main/main.cpp