Merge pull request #1 from mean2k/noBugs

No bugs
footer and main changes
Merge pull request #2 from mean2k/Customer

footer and main changes
restructuring of html pages
code cleanup
Merge pull request #3 from mean2k/steka

code cleanup
Merge pull request #4 from mean2k/noBugs

No bugs
structure and pages and routing
Merge pull request #5 from mean2k/noBugs_steka

No bugs steka
Merge pull request #6 from mean2k/noBugs

chnages: show customer
Merge pull request #7 from mean2k/noBugs

merge
new logo
Merge pull request #8 from mean2k/steka

new logo
Merge remote-tracking branch 'origin/noBugs' into master_steka

Conflicts:
	public/stylesheets/naukanu_style.css
Added Youtube Video for resolving conflicts
Merge pull request #10 from mean2k/master_steka

Master steka
Merge pull request #11 from mean2k/noBugs

changes: staff references
changes: db tables