added license
Merge branch 'master' of https://github.com/GuilhermeMedeiros/iceland-time-tracking

Conflicts:
	timetracking/api/__init__.pyc
	timetracking/timetracking/__init__.pyc
	timetracking/timetracking/settings.pyc