Admin intial stage
Merge branch 'master' of https://github.com/befreeit/simplifiedtax

Conflicts:
	protected/runtime/application.log
Merge branch 'master' of https://github.com/befreeit/simplifiedtax