Working implementation for issue-1216
issue 1216: added functional test file
Revert "issue 1216: added functional test file"

This reverts commit 6b69db132c6b50aa3885c7556044694668eb75de.
isue-1216: added functional tests
Revert "isue-1216: added functional tests"

This reverts commit ac1f4420d05eb2927117bb9332a4c29da34d6201.
issue-1216: added functional tests
issue-1216: improved code quality
Fixed merge conflicts.
Deleted 'Head >>>' comment from previous merge conflict.
Style Formatting.
Style Formatting.
Style Formatting.
Replace model symbol hash rockets with 1.9 syntax

This is a global search-and-replace that replaces the Ruby 1.8 symbol
key hash rocket syntax to Ruby 1.9 syntax in model code.

Since this is a big change list, the style issues in the changed lines
are not being dealt with so that errors are minimized and code review
is easier. There is one exception though:

If the lines before the change have a good alignment of hash keys that
span multiple lines and the lines after the change do not (because the
change might alters the number of spaces needed for the alignment), then
the alignment is fixed, such that no new style issues are introduced. If
the alignment was not correct to begin with, then it is not fixed.

As a result, please ignore linter comments for this change.

Tested:
- rake test:units
- rake test:functionals
- rails s
Replace controller symbol hash rockets (part 1)

This is a global search-and-replace that replaces the Ruby 1.8 symbol
key hash rocket syntax to Ruby 1.9 syntax in

        app/controllers/{a,b,c,e,f,g}*.rb

Since this is a big change list, the style issues in the changed lines
are not being dealt with so that errors are minimized and code review
is easier. There is one exception though:

If the lines before the change have a good alignment of hash keys that
span multiple lines and the lines after the change do not (because the
change might alters the number of spaces needed for the alignment), then
the alignment is fixed, such that no new style issues are introduced. If
the alignment was not correct to begin with, then it is not fixed.

As a result, please ignore linter comments for this change.

Tested:
- rake test:units
- rake test:functionals
- rails s
Replace controller symbol hash rockets (part 2)

This is a global search-and-replace that replaces the Ruby 1.8 symbol
key hash rocket syntax to Ruby 1.9 syntax in

        app/controllers/{m,n,r,s,t}*.rb

Since this is a big change list, the style issues in the changed lines
are not being dealt with so that errors are minimized and code review
is easier. There is one exception though:

If the lines before the change have a good alignment of hash keys that
span multiple lines and the lines after the change do not (because the
change might alters the number of spaces needed for the alignment), then
the alignment is fixed, such that no new style issues are introduced. If
the alignment was not correct to begin with, then it is not fixed.

As a result, please ignore linter comments for this change.

Tested:
- rake test:units
- rake test:functionals
- rails s
Replace helpers, lib, config, Gemfile hash rockets

This is a global search-and-replace that replaces the Ruby 1.8 symbol
key hash rocket syntax to Ruby 1.9 syntax in

        {lib,config,app/helpers,Gemfile}

Since this is a big change list, the style issues in the changed lines
are not being dealt with so that errors are minimized and code review
is easier. There is one exception though:

If the lines before the change have a good alignment of hash keys that
span multiple lines and the lines after the change do not (because the
change might alters the number of spaces needed for the alignment), then
the alignment is fixed, such that no new style issues are introduced. If
the alignment was not correct to begin with, then it is not fixed.

As a result, please ignore linter comments for this change.

Tested:
- rake test:units
- rake test:functionals
- rails s
Merge pull request #1506 from ealonas/issue-1227

Issue 1227 - Conflicts Solved. Fixes #1216.
Merge branch 'aux_hash_syntax' of https://github.com/zhangsu/Markus into zhangsu-aux-hash

Conflicts:
	app/helpers/pagination_helper.rb
Merge pull request #1515 from zhangsu/controller_hash_syntax2

Replace controller symbol hash rockets (part 2)
Merge pull request #1514 from zhangsu/controller_hash_syntax1

Replace controller symbol hash rockets (part 1)