Program description
Merge branch 'dev' of https://github.com/redc0de/IATI into dev

Conflicts:
	src/Program.java