modified:   app/controllers/AccountsController.php
	modified:   app/controllers/CharactersController.php
	modified:   app/models/Account.php
	modified:   app/models/Character.php
	modified:   app/routes.php
	new file:   app/views/accounts/_characters_info.blade.php
	new file:   app/views/accounts/_general_info.blade.php
	modified:   app/views/accounts/index.blade.php
	new file:   app/views/accounts/modals/_change_email.blade.php
	new file:   app/views/accounts/modals/_change_password.blade.php
	new file:   app/views/accounts/modals/_create_character.blade.php
	new file:   app/views/accounts/modals/_rename_account.blade.php
	new file:   app/views/accounts/modals/_terminate_account.blade.php
	new file:   app/views/accounts/modals/master.blade.php
	new file:   app/views/characters/_general_data.blade.php
	new file:   app/views/characters/_general_info.blade.php
	new file:   app/views/characters/edit.blade.php
	new file:   app/views/layouts/_navbar.blade.php
	modified:   app/views/layouts/master.blade.php
	new file:   app/views/sidebar/_highscores.blade.php
	new file:   app/views/sidebar/master.blade.php
	modified:   public/css/bootstrap.min.css
	modified:   schema.sql
Merge branch 'master' of http://github.com/ranisalt/zenith-aac