Initial github commit
Merge branch 'master' of github.com:arosar/apframework

Conflicts:
	LICENSE