updates
Merge branch 'master' of https://github.com/Zukzuk/DAVE_Films

Conflicts:
	development/.idea/workspace.xml
	development/application/controllers/secureddata.php
	development/js/app/app.data.js
	development/js/modules/films.js
	development/style/css/font-awesome-ie7.css
	development/style/css/font-awesome.css
	development/style/css/style.css
ignore db connect