Followed from studio
Followed from studio
Случайно добавил index.waPage
.gitignore linefeed characters updated
Preliminary specification word-file added
EPC diagram added
Merge branch 'master' into iss-1_Top_menu

Conflicts resolved:
	RetailmentAcademy/WebFolder/index.waPage/index.package.json
	RetailmentAcademy/WebFolder/index.waPage/styles/index.css
* Changes for redmine issues #1341, #1336 are applied
+ Login string on top of page
* Layout redesigned for through lined fashion
Merge branch 'master' into iss-1_Top_menu

Resolved conflicts:
	uml/wf_mainmenu.iuml
	uml/wireframe_001.png
	uml/wireframe_002.png
	uml/wireframe_003.png