new placeholder image
content page added
user detail page
Merge branch 'development' into story/042

* development:
  Fixed logout and cleaned up AccountController
  Fixed language selection another time. *grml*
Merge branch 'development' into story/042

* development: (36 commits)
  Fixed previous merge commit
  019 Search Fix SQL-Injection
  019 Search Ändern der SQL Statements auf Joins
  changed hard coded count in search
  removed debug output
  fixed layout search
  Controller: redirect layout or layout_public
  Changed join-link on / to /account/register
  Fixed search sql.
  019 Search Anzeige der Einträge
  Show result values in search/get-results.phtml
  Added search/get-results action.
  Merge remote-tracking branch 'origin/story/019' into story/019 Ajax-Action für SearchResults
  Clear search results before showing the search screen
  019 Search Filter update
  Fixed sidebar markup and improved search javascripts.
  LESS reformat and pointer cursor for search cancel icon.
  Added cancel and escape handlers to the search bar.
  Recovered getters and setters in the sidebar helper
  added getAttributesByMetaId
  ...
Basic layout for content-detail-page
ContentController -> ViewAction
Merge remote-tracking branch 'origin/playground/dragos' into playground/dragos
create group & content pages
Merge branch 'playground/dragos' of https://github.com/massidea/site into playground/dragos
042 Matching Users
Anzeige der Matching Users
Further layouting
ContentController -> ViewAction
Merge remote-tracking branch 'origin/playground/dragos' into playground/dragos
view.php
fill with data
Added Less-Files and icons
Merge remote-tracking branch 'origin/playground/dragos' into playground/dragos
Merge branch 'playground/dragos' into development

* playground/dragos:
  Added Less-Files and icons
  view.php fill with data
  ContentController -> ViewAction
  Further layouting
  create group & content pages
  ContentController -> ViewAction
  Basic layout for content-detail-page
  user detail page
  content page added
  new placeholder image

Conflicts:
	application/controllers/ContentController.php
	application/controllers/ViewController.php
	www/css/massidea.less
Inject language into view helpers.