GROUP 2 Michal taches
Merge https://github.com/LPSILAIX2014-2015/RealFNE13

Conflicts:
	.idea/.name
	.idea/FNE13.iml
	.idea/encodings.xml
	.idea/inspectionProfiles/Project_Default.xml
	.idea/inspectionProfiles/profiles_settings.xml
	.idea/misc.xml
	.idea/modules.xml
	.idea/scopes/scope_settings.xml
	.idea/sqldialects.xml
	.idea/vcs.xml
	.idea/workspace.xml
	DBFNE.sql
	Fonts/glyphicons-halflings-regular.eot
	Fonts/glyphicons-halflings-regular.svg
	Fonts/glyphicons-halflings-regular.ttf
	Fonts/glyphicons-halflings-regular.woff
	Html/accueil.php
	Html/menu.php
	Html/page.php
	Html/reportlist.php
	Html/unknown.php
	Html/userInfo.php
	Img/body_fond.jpg
	Img/photo.jpg
	Inc/globals.inc.php
	Inc/require.inc.php
	Js/npm.js
	Php/DBase.php
	View/VHome.view.php
	View/VHtml.view.php
	View/VNav.view.php
	View/layout.view.php
group 2 michal taches