internal / external time view
Merge branch 'master' of https://github.com/Magrit/miniature-ninja-agile-awesomeness

Conflicts:
	src/project.properties
Merge branch 'master' of https://github.com/Magrit/miniature-ninja-agile-awesomeness