Merge origin/master

Conflicts:
	application/config/database.php
	application/controllers/dashbord.php
	application/controllers/login.php
	application/models/dashbord_model.php
	application/views/admin_dashbord.php
	application/views/admin_dashbord_update.php
	application/views/admin_message_view.php
	application/views/alert_view.php
	application/views/dashbord.php
	application/views/dashbord_msg.php
	application/views/footer.php
	application/views/header.php
	assets/css/bootstrap-combined.min.css
	assets/css/bootstrap-responsive.css
	assets/css/bootstrap.css
	assets/css/bootstrap.min.css
	assets/css/bootstrap_1.css
	assets/css/datepicker.css
	assets/css/jquery.dataTables.css
	assets/css/jquery.ui.all.css
	assets/css/jquery.ui.datepicker.css
	assets/css/ofss.css
	assets/css/open-iconic-bootstrap.css
	assets/css/open-iconic-bootstrap.min.css
	assets/font-awesome/fonts/fontawesome-webfont.eot
	assets/font-awesome/fonts/fontawesome-webfont.svg
	assets/font-awesome/fonts/fontawesome-webfont.ttf
	assets/font-awesome/fonts/fontawesome-webfont.woff
	assets/js/bootstrap-alert.js
	assets/js/bootstrap-datepicker.js
	assets/js/bootstrap-dropdown.js
	assets/js/bootstrap-modal.js
	assets/js/bootstrap.js
	assets/js/bootstrap.min.js
	assets/js/jquery-1.10.2.js
	assets/js/jquery-2.0.3.min.js
	assets/js/jquery.dataTables.min.js
	assets/js/jquery.min.js
	assets/js/jquery.mobile-1.4.2.min.js
	assets/js/jquery.ui.core.js
	assets/js/jquery.ui.datepicker.js
	assets/js/jquery.ui.widget.js
	assets/js/tabcordion.js
	assets/ncss/bootstrap.css
	assets/ncss/bootstrap.min.css
	fonts/glyphicons-halflings-regular.eot
	fonts/glyphicons-halflings-regular.svg
	fonts/glyphicons-halflings-regular.ttf
	fonts/glyphicons-halflings-regular.woff
	img/ appe.gif
	img/1.png
	img/10.png
	img/11.png
	img/12.png
	img/13.png
	img/14.png
	img/15.png
	img/16.png
	img/17.png
	img/18.png
	img/19.png
	img/2.png
	img/20.png
	img/21.png
	img/22.png
	img/23.png
	img/24.png
	img/25.png
	img/26.png
	img/27.png
	img/28.png
	img/29.png
	img/3.png
	img/30.png
	img/31.png
	img/32.png
	img/33.png
	img/34.png
	img/35.png
	img/36.png
	img/37.png
	img/38.png
	img/39.png
	img/4.png
	img/40.png
	img/41.png
	img/42.png
	img/43.png
	img/44.png
	img/45.png
	img/46.png
	img/47.png
	img/48.png
	img/49.png
	img/5.png
	img/50.png
	img/51.png
	img/52.png
	img/53.png
	img/54.png
	img/55.png
	img/56.png
	img/57.png
	img/58.png
	img/59.png
	img/6.png
	img/60.png
	img/61.png
	img/62.png
	img/63.png
	img/64.png
	img/65.png
	img/66.png
	img/67.png
	img/68.png
	img/69.png
	img/7.png
	img/70.png
	img/71.png
	img/72.png
	img/73.png
	img/74.png
	img/75.png
	img/76.png
	img/77.png
	img/78.png
	img/79.png
	img/8.png
	img/80.png
	img/9.png
	img/account-login.svg
	img/account-logout.svg
	img/dashboard.svg
	img/document.svg
	img/external-link.svg
	img/eye.svg
	img/flag.svg
	img/folder.svg
	img/glyphicons-halflings-white.png
	img/glyphicons-halflings.png
	img/home.svg
	img/inbox.svg
	img/loading.gif
	img/moving .gif
	img/pencil.svg
	img/person.svg
	img/print.svg
	img/rss-alt.svg
	img/rss.svg
	img/star.svg
	img/target.svg
	img/task.svg
	system/core/Benchmark.php
	system/core/CodeIgniter.php
	system/core/Config.php
	system/core/Exceptions.php
	system/core/Hooks.php
	system/core/Input.php
	system/core/Lang.php
	system/core/Model.php
	system/core/Output.php
	system/core/Router.php
	system/core/Security.php
	system/core/URI.php
	system/database/DB.php
	user_guide/images/reactor-bullet.png
	user_guide/nav/moo.fx.js
	user_guide/nav/prototype.lite.js
Merge origin/master
Merge origin/master

Conflicts:
	application/config/database.php
	application/controllers/dashbord.php
	application/controllers/login.php
	application/models/dashbord_model.php
	application/views/admin_dashbord.php
	application/views/admin_dashbord_update.php
	application/views/admin_message_view.php
	application/views/alert_view.php
	application/views/dashbord.php
	application/views/dashbord_msg.php
	application/views/footer.php
	application/views/header.php
	assets/css/bootstrap-combined.min.css
	assets/css/bootstrap-responsive.css
	assets/css/bootstrap.css
	assets/css/bootstrap.min.css
	assets/css/bootstrap_1.css
	assets/css/datepicker.css
	assets/css/jquery.dataTables.css
	assets/css/jquery.ui.all.css
	assets/css/jquery.ui.datepicker.css
	assets/css/ofss.css
	assets/css/open-iconic-bootstrap.css
	assets/css/open-iconic-bootstrap.min.css
	assets/font-awesome/fonts/fontawesome-webfont.eot
	assets/font-awesome/fonts/fontawesome-webfont.svg
	assets/font-awesome/fonts/fontawesome-webfont.ttf
	assets/font-awesome/fonts/fontawesome-webfont.woff
	assets/js/bootstrap-alert.js
	assets/js/bootstrap-datepicker.js
	assets/js/bootstrap-dropdown.js
	assets/js/bootstrap-modal.js
	assets/js/bootstrap.js
	assets/js/bootstrap.min.js
	assets/js/jquery-1.10.2.js
	assets/js/jquery-2.0.3.min.js
	assets/js/jquery.dataTables.min.js
	assets/js/jquery.min.js
	assets/js/jquery.mobile-1.4.2.min.js
	assets/js/jquery.ui.core.js
	assets/js/jquery.ui.datepicker.js
	assets/js/jquery.ui.widget.js
	assets/js/tabcordion.js
	assets/ncss/bootstrap.css
	assets/ncss/bootstrap.min.css
	fonts/glyphicons-halflings-regular.eot
	fonts/glyphicons-halflings-regular.svg
	fonts/glyphicons-halflings-regular.ttf
	fonts/glyphicons-halflings-regular.woff
	img/ appe.gif
	img/1.png
	img/10.png
	img/11.png
	img/12.png
	img/13.png
	img/14.png
	img/15.png
	img/16.png
	img/17.png
	img/18.png
	img/19.png
	img/2.png
	img/20.png
	img/21.png
	img/22.png
	img/23.png
	img/24.png
	img/25.png
	img/26.png
	img/27.png
	img/28.png
	img/29.png
	img/3.png
	img/30.png
	img/31.png
	img/32.png
	img/33.png
	img/34.png
	img/35.png
	img/36.png
	img/37.png
	img/38.png
	img/39.png
	img/4.png
	img/40.png
	img/41.png
	img/42.png
	img/43.png
	img/44.png
	img/45.png
	img/46.png
	img/47.png
	img/48.png
	img/49.png
	img/5.png
	img/50.png
	img/51.png
	img/52.png
	img/53.png
	img/54.png
	img/55.png
	img/56.png
	img/57.png
	img/58.png
	img/59.png
	img/6.png
	img/60.png
	img/61.png
	img/62.png
	img/63.png
	img/64.png
	img/65.png
	img/66.png
	img/67.png
	img/68.png
	img/69.png
	img/7.png
	img/70.png
	img/71.png
	img/72.png
	img/73.png
	img/74.png
	img/75.png
	img/76.png
	img/77.png
	img/78.png
	img/79.png
	img/8.png
	img/80.png
	img/9.png
	img/account-login.svg
	img/account-logout.svg
	img/dashboard.svg
	img/document.svg
	img/external-link.svg
	img/eye.svg
	img/flag.svg
	img/folder.svg
	img/glyphicons-halflings-white.png
	img/glyphicons-halflings.png
	img/home.svg
	img/inbox.svg
	img/loading.gif
	img/moving .gif
	img/pencil.svg
	img/person.svg
	img/print.svg
	img/rss-alt.svg
	img/rss.svg
	img/star.svg
	img/target.svg
	img/task.svg
	system/core/Benchmark.php
	system/core/CodeIgniter.php
	system/core/Config.php
	system/core/Exceptions.php
	system/core/Hooks.php
	system/core/Input.php
	system/core/Lang.php
	system/core/Model.php
	system/core/Output.php
	system/core/Router.php
	system/core/Security.php
	system/core/URI.php
	system/database/DB.php
	user_guide/images/reactor-bullet.png
	user_guide/nav/moo.fx.js
	user_guide/nav/prototype.lite.js
Merge origin/master

Conflicts:
	application/controllers/change_form.php