Merge branch 'master' of https://github.com/sgtan/animood

Conflicts:
	htdocs/application/config/config.php
	htdocs/application/config/database.php
	htdocs/application/config/routes.php
	htdocs/application/models/user_model.php
	htdocs/application/views/footer.php
	htdocs/application/views/head.php
	htdocs/application/views/header.php
	htdocs/application/views/login_view.php
	htdocs/application/views/main_content.php
	htdocs/application/views/navigation.php
	htdocs/script/script.js
	htdocs/style/styles.css
Merge branch 'master' of https://github.com/sgtan/animood

Conflicts:
	htdocs/application/config/config.php
	htdocs/application/config/database.php
	htdocs/application/config/routes.php
	htdocs/application/models/user_model.php
	htdocs/application/views/footer.php
	htdocs/application/views/head.php
	htdocs/application/views/header.php
	htdocs/application/views/login_view.php
	htdocs/application/views/main_content.php
	htdocs/application/views/navigation.php
	htdocs/script/script.js
	htdocs/style/styles.css