Merge branch 'master' of ssh://github.com/titaniaa/ravian

Conflicts:
	MusicApp.pdf
	Vagrantfile
	app/commands/.gitkeep
	app/config/app.php
	app/config/auth.php
	app/config/cache.php
	app/config/compile.php
	app/config/database.php
	app/config/mail.php
	app/config/packages/.gitkeep
	app/config/packages/zizaco/confide/.gitkeep
	app/config/packages/zizaco/confide/config.php
	app/config/queue.php
	app/config/remote.php
	app/config/session.php
	app/config/testing/cache.php
	app/config/testing/database.php
	app/config/testing/session.php
	app/config/view.php
	app/config/workbench.php
	app/controllers/.gitkeep
	app/controllers/AdminController.php
	app/controllers/AuthorizedController.php
	app/controllers/BaseController.php
	app/controllers/admin/AdminDashboardController.php
	app/controllers/admin/AdminRolesController.php
	app/controllers/admin/AdminUsersController.php
	app/controllers/user/UserController.php
	app/database/migrations/.gitkeep
	app/database/migrations/2013_02_05_024934_confide_setup_users_table.php
	app/database/migrations/2013_02_08_031702_entrust_setup_tables.php
	app/database/migrations/2013_05_21_024934_entrust_permissions.php
	app/database/production.sqlite
	app/database/seeds/.gitkeep
	app/database/seeds/DatabaseSeeder.php
	app/database/seeds/PermissionsTableSeeder.php
	app/database/seeds/RolesTableSeeder.php
	app/database/seeds/UsersTableSeeder.php
	app/filters.php
	app/lang/en/admin/blogs/messages.php
	app/lang/en/admin/blogs/table.php
	app/lang/en/admin/blogs/title.php
	app/lang/en/admin/comments/messages.php
	app/lang/en/admin/comments/table.php
	app/lang/en/admin/comments/title.php
	app/lang/en/admin/roles/messages.php
	app/lang/en/admin/roles/table.php
	app/lang/en/admin/roles/title.php
	app/lang/en/admin/users/messages.php
	app/lang/en/admin/users/table.php
	app/lang/en/admin/users/title.php
	app/lang/en/button.php
	app/lang/en/general.php
	app/lang/en/messages.php
	app/lang/en/pagination.php
	app/lang/en/reminders.php
	app/lang/en/site.php
	app/lang/en/table.php
	app/lang/en/user/user.php
	app/lang/en/validation.php
	app/lang/es_ES/admin/blogs/messages.php
	app/lang/es_ES/admin/blogs/table.php
	app/lang/es_ES/admin/blogs/title.php
	app/lang/es_ES/admin/comments/messages.php
	app/lang/es_ES/admin/comments/table.php
	app/lang/es_ES/admin/comments/title.php
	app/lang/es_ES/admin/roles/messages.php
	app/lang/es_ES/admin/roles/table.php
	app/lang/es_ES/admin/roles/title.php
	app/lang/es_ES/admin/users/messages.php
	app/lang/es_ES/admin/users/table.php
	app/lang/es_ES/admin/users/title.php
	app/lang/es_ES/button.php
	app/lang/es_ES/general.php
	app/lang/es_ES/messages.php
	app/lang/es_ES/pagination.php
	app/lang/es_ES/reminders.php
	app/lang/es_ES/site.php
	app/lang/es_ES/table.php
	app/lang/es_ES/user/user.php
	app/lang/es_ES/validation.php
	app/lang/pt/admin/blogs/messages.php
	app/lang/pt/admin/blogs/table.php
	app/lang/pt/admin/comments/messages.php
	app/lang/pt/admin/comments/table.php
	app/lang/pt/admin/roles/messages.php
	app/lang/pt/admin/roles/table.php
	app/lang/pt/admin/users/messages.php
	app/lang/pt/admin/users/table.php
	app/lang/pt/admin/users/title.php
	app/lang/pt/button.php
	app/lang/pt/general.php
	app/lang/pt/messages.php
	app/lang/pt/pagination.php
	app/lang/pt/reminders.php
	app/lang/pt/site.php
	app/lang/pt/table.php
	app/lang/pt/user/user.php
	app/lang/pt/validation.php
	app/library/Andrew13/Helpers/String.php
	app/models/AssignedRoles.php
	app/models/Permission.php
	app/models/Role.php
	app/models/User.php
	app/routes.php
	app/start/artisan.php
	app/start/global.php
	app/start/local.php
	app/storage/.gitignore
	app/storage/logs/.gitignore
	app/storage/meta/.gitignore
	app/storage/sessions/.gitignore
	app/storage/views/.gitignore
	app/tests/blueprints/Comment.php
	app/tests/blueprints/Permission.php
	app/tests/blueprints/Post.php
	app/tests/blueprints/Role.php
	app/tests/blueprints/User.php
	app/tests/controllers/UserControllerTest.php
	app/tests/library/BaseControllerTestCase.php
	app/tests/library/TestCase.php
	app/tests/models/CommentTest.php
	app/tests/models/PermissionTest.php
	app/tests/models/PostTest.php
	app/tests/models/RoleTest.php
	app/tests/models/UserTest.php
	app/tests/views/site/pages/BlogArticleTest.php
	app/tests/views/site/pages/BlogTest.php
	app/views/admin/dashboard.blade.php
	app/views/admin/layouts/default.blade.php
	app/views/admin/layouts/modal.blade.php
	app/views/admin/roles/create.blade.php
	app/views/admin/roles/delete.blade.php
	app/views/admin/roles/edit.blade.php
	app/views/admin/roles/index.blade.php
	app/views/admin/users/create_edit.blade.php
	app/views/admin/users/delete.blade.php
	app/views/admin/users/index.blade.php
	app/views/emails/auth/reminder.blade.php
	app/views/error/403.blade.php
	app/views/error/404.blade.php
	app/views/error/500.blade.php
	app/views/notifications.blade.php
	app/views/site/contact-us.blade.php
	app/views/site/layouts/default.blade.php
	app/views/site/user/create.blade.php
	app/views/site/user/dashboard.blade.php
	app/views/site/user/forgot.blade.php
	app/views/site/user/index.blade.php
	app/views/site/user/login.blade.php
	app/views/site/user/profile.blade.php
	app/views/site/user/reset.blade.php
	artisan
	bootstrap/autoload.php
	bootstrap/paths.php
	bootstrap/start.php
	composer.json
	local-script.sh
	phpunit.xml
	public/.htaccess
	public/assets/css/bootstrap-responsive.css
	public/assets/css/bootstrap.css
	public/assets/css/colorbox.css
	public/assets/css/datatables-bootstrap.css
	public/assets/css/images/border.png
	public/assets/css/images/controls.png
	public/assets/css/images/loading.gif
	public/assets/css/images/loading_background.png
	public/assets/css/images/overlay.png
	public/assets/css/wysihtml5/bootstrap-wysihtml5.css
	public/assets/css/wysihtml5/prettify.css
	public/assets/fonts/bootstrap/glyphicons-halflings-regular.eot
	public/assets/fonts/bootstrap/glyphicons-halflings-regular.svg
	public/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf
	public/assets/fonts/bootstrap/glyphicons-halflings-regular.woff
	public/assets/ico/apple-touch-icon-114-precomposed.png
	public/assets/ico/apple-touch-icon-144-precomposed.png
	public/assets/ico/apple-touch-icon-57-precomposed.png
	public/assets/ico/apple-touch-icon-72-precomposed.png
	public/assets/ico/favicon.png
	public/assets/img/datatables/sort_asc.png
	public/assets/img/datatables/sort_asc_disabled.png
	public/assets/img/datatables/sort_both.png
	public/assets/img/datatables/sort_desc.png
	public/assets/img/datatables/sort_desc_disabled.png
	public/assets/js/bootstrap/bootstrap.js
	public/assets/js/datatables-bootstrap.js
	public/assets/js/datatables.fnReloadAjax.js
	public/assets/js/jquery.colorbox.js
	public/assets/js/prettify.js
	public/assets/js/wysihtml5/bootstrap-wysihtml5.js
	public/assets/js/wysihtml5/wysihtml5-0.3.0.js
	public/bootstrap/css/bootstrap-theme.css
	public/bootstrap/css/bootstrap-theme.css.map
	public/bootstrap/css/bootstrap-theme.min.css
	public/bootstrap/css/bootstrap.css
	public/bootstrap/css/bootstrap.css.map
	public/bootstrap/css/bootstrap.min.css
	public/bootstrap/fonts/glyphicons-halflings-regular.eot
	public/bootstrap/fonts/glyphicons-halflings-regular.svg
	public/bootstrap/fonts/glyphicons-halflings-regular.ttf
	public/bootstrap/fonts/glyphicons-halflings-regular.woff
	public/bootstrap/js/affix.js
	public/bootstrap/js/alert.js
	public/bootstrap/js/bootstrap.js
	public/bootstrap/js/bootstrap.min.js
	public/bootstrap/js/button.js
	public/bootstrap/js/carousel.js
	public/bootstrap/js/collapse.js
	public/bootstrap/js/dropdown.js
	public/bootstrap/js/modal.js
	public/bootstrap/js/popover.js
	public/bootstrap/js/scrollspy.js
	public/bootstrap/js/tab.js
	public/bootstrap/js/tooltip.js
	public/bootstrap/js/transition.js
	public/favicon.ico
	public/index.php
	public/packages/.gitkeep
	public/robots.txt
	readme.md
	server.php