Adding allowed sources for remote ajax calls
Merge branch 'dev' of https://github.com/ffffranklin/zendla into dev
Merge branch 'master' of https://github.com/ffffranklin/zendla
Merge branch 'refs/heads/dev'

Conflicts:
	api/.htaccess
removing unecessary .htaccess file
Implement designs